Include frame.h before fontset.h.

diff --git a/src/frame.c b/src/frame.c
index 6648a9b384d4e6ddf9592226fc443ac3e04c25b4..64b146ce0b463f7e58f3983d18c2d119a19b11b7 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -26,13 +26,13 @@ Boston, MA 02111-1307, USA.  */
 #endif
 #include "lisp.h"
 #include "charset.h"
-#ifdef HAVE_WINDOW_SYSTEM
-#include "fontset.h"
-#endif
 #ifdef HAVE_X_WINDOWS
 #include "xterm.h"
 #endif
 #include "frame.h"
+#ifdef HAVE_WINDOW_SYSTEM
+#include "fontset.h"
+#endif
 #include "termhooks.h"
 #include "dispextern.h"
 #include "window.h"

diff --git a/src/xterm.c b/src/xterm.c
index 5b0eb720ccbc2b544fc42f699be279c53f9daf75..b9a8d1c3ed4976450907f25d40dc6a67d151b0b7 100644 (file)
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -70,8 +70,8 @@ Boston, MA 02111-1307, USA.  */
 
 #include "charset.h"
 #include "ccl.h"
-#include "fontset.h"
 #include "frame.h"
+#include "fontset.h"
 #include "dispextern.h"
 #include "termhooks.h"
 #include "termopts.h"